Remove 'CR/LF'-sses and similary token from alias names (CET dosn't handle line-breaks).

diff --git a/gpsbabel/cet/ansi_x3_4_1968.h b/gpsbabel/cet/ansi_x3_4_1968.h
index 690ae515ab830f083a2740dd940d5bf84b17fa57..7136bb94baaca0095b0958fec80ddc2963dd3f5d 100644 (file)
--- a/gpsbabel/cet/ansi_x3_4_1968.h
+++ b/gpsbabel/cet/ansi_x3_4_1968.h
@@ -28,10 +28,10 @@
 
 const char *cet_cs_alias_ansi_x3_4_1968[] = 
 {
-       "ANSI_X3.4-1968", "367/CR-LF", "ANSI_X3.4-1986", "ASCII", 
-       "CP367/CR-LF", "csASCII", "IBM367/CR-LF", "ISO646-US", 
+       "ANSI_X3.4-1968", "367", "ANSI_X3.4-1986", "ASCII", 
+       "CP367", "csASCII", "IBM367", "ISO646-US", 
        "ISO646.1991-IRV", "iso-ir-6", "ISO_646.irv:1991", "us", 
-       "US-ASCII", NULL
+       NULL
 };
 
 #define cet_ucs4_ofs_ansi_x3_4_1968 128

diff --git a/gpsbabel/cet/cp1250.h b/gpsbabel/cet/cp1250.h
index 6440aa28dd5bf3a03e17d39c6caf26567f9dacff..c16ba4d01260e773d77a2020667b03429b355ee4 100644 (file)
--- a/gpsbabel/cet/cp1250.h
+++ b/gpsbabel/cet/cp1250.h
@@ -28,7 +28,7 @@
 
 const char *cet_cs_alias_cp1250[] = 
 {
-       "CP1250/CR-LF", "1250/CR-LF", "ms-ee", "windows-1250", "WIN-CP1250",
+       "CP1250", "1250", "ms-ee", "windows-1250", "WIN-CP1250",
        NULL
 };
 

diff --git a/gpsbabel/cet/cp1251.h b/gpsbabel/cet/cp1251.h
index 7c4b494af4e49dc61c3d699e6f202e2241c52206..efa2195c3d94e1f894434f97e01ee6fed3b762d4 100644 (file)
--- a/gpsbabel/cet/cp1251.h
+++ b/gpsbabel/cet/cp1251.h
@@ -28,7 +28,7 @@
 
 const char *cet_cs_alias_cp1251[] = 
 {
-       "CP1251/CR-LF", "1251/CR-LF", "ms-cyrl", "windows-1251", "WIN-CP1251",
+       "CP1251", "1251", "ms-cyrl", "windows-1251", "WIN-CP1251",
        NULL
 };
 

diff --git a/gpsbabel/cet/cp1252.h b/gpsbabel/cet/cp1252.h
index bf5ca0d501b4b37f83985442021570da7d9590cd..01f202325be9800985b30ddb945acd128f837dfd 100644 (file)
--- a/gpsbabel/cet/cp1252.h
+++ b/gpsbabel/cet/cp1252.h
@@ -28,7 +28,7 @@
 
 const char *cet_cs_alias_cp1252[] = 
 {
-       "CP1252/CR-LF", "1252/CR-LF", "ms-ansi", "windows-1252", "WIN-CP1252",
+       "CP1252", "1252", "ms-ansi", "windows-1252", "WIN-CP1252",
        NULL
 };
 

diff --git a/gpsbabel/cet/cp1253.h b/gpsbabel/cet/cp1253.h
index a62caf745c11c4e5ffcdcfe6afd6f343821d0404..7271398472c09466ace8f6bfb6e0d0be00bb4b07 100644 (file)
--- a/gpsbabel/cet/cp1253.h
+++ b/gpsbabel/cet/cp1253.h
@@ -28,7 +28,7 @@
 
 const char *cet_cs_alias_cp1253[] = 
 {
-       "CP1253/CR-LF", "1253/CR-LF", "ms-greek", "windows-1253", "WIN-CP1253",
+       "CP1253", "1253", "ms-greek", "windows-1253", "WIN-CP1253",
        NULL
 };
 

diff --git a/gpsbabel/cet/cp1254.h b/gpsbabel/cet/cp1254.h
index 3995e09429c50d86070ec8d2809c33c1b7ac947c..55b75b6db01b43b8af7f8abd1eb7a96390a3b673 100644 (file)
--- a/gpsbabel/cet/cp1254.h
+++ b/gpsbabel/cet/cp1254.h
@@ -28,7 +28,7 @@
 
 const char *cet_cs_alias_cp1254[] = 
 {
-       "CP1254/CR-LF", "1254/CR-LF", "ms-turk", "windows-1254", "WIN-CP1254",
+       "CP1254", "1254", "ms-turk", "windows-1254", "WIN-CP1254",
        NULL
 };
 

diff --git a/gpsbabel/cet/cp1255.h b/gpsbabel/cet/cp1255.h
index 1554174374cf12b38fe8da52529b5dcacaee303d..d80498da3c2a6cbcf035e89e37eea6e98939d634 100644 (file)
--- a/gpsbabel/cet/cp1255.h
+++ b/gpsbabel/cet/cp1255.h
@@ -28,7 +28,7 @@
 
 const char *cet_cs_alias_cp1255[] = 
 {
-       "CP1255/CR-LF", "1255/CR-LF", "ms-hebr", "windows-1255", "WIN-CP1255",
+       "CP1255", "1255", "ms-hebr", "windows-1255", "WIN-CP1255",
        NULL
 };
 

diff --git a/gpsbabel/cet/cp1256.h b/gpsbabel/cet/cp1256.h
index 52a554e99e021844e400f904e114498fa5ca3b1f..b4d8941c5bdfc956cc219a1a7fdcb8cdcb640b12 100644 (file)
--- a/gpsbabel/cet/cp1256.h
+++ b/gpsbabel/cet/cp1256.h
@@ -28,7 +28,7 @@
 
 const char *cet_cs_alias_cp1256[] = 
 {
-       "CP1256/CR-LF", "1256/CR-LF", "ms-arab", "windows-1256", "WIN-CP1256",
+       "CP1256", "1256", "ms-arab", "windows-1256", "WIN-CP1256",
        NULL
 };
 

diff --git a/gpsbabel/cet/cp1257.h b/gpsbabel/cet/cp1257.h
index 070321ab29dcf6db38cf7027d965aa4b5d3438f2..3e9355fd1e3cb9e65ba38ff870c8d8d50c074430 100644 (file)
--- a/gpsbabel/cet/cp1257.h
+++ b/gpsbabel/cet/cp1257.h
@@ -28,7 +28,7 @@
 
 const char *cet_cs_alias_cp1257[] = 
 {
-       "CP1257/CR-LF", "1257/CR-LF", "WinBaltRim", "windows-1257", "WIN-CP1257",
+       "CP1257", "1257", "WinBaltRim", "windows-1257", "WIN-CP1257",
        NULL
 };
 

diff --git a/gpsbabel/cet/ibm037.h b/gpsbabel/cet/ibm037.h
index 67488a73380c4aeb3b94c42c696a399b5d77eb39..3e49137204360eb79f21e5e73a1b0ed4e8ca9833 100644 (file)
--- a/gpsbabel/cet/ibm037.h
+++ b/gpsbabel/cet/ibm037.h
@@ -28,7 +28,7 @@
 
 const char *cet_cs_alias_ibm037[] = 
 {
-       "IBM037/CR-LF", "037/CR-LF", "CP037/CR-LF", "ebcdic-cp-ca", 
+       "IBM037", "037", "CP037", "ebcdic-cp-ca", 
        "ebcdic-cp-nl", "ebcdic-cp-us", "ebcdic-cp-wt", NULL
 };
 

diff --git a/gpsbabel/cet/ibm1004.h b/gpsbabel/cet/ibm1004.h
index d05fe37d80be6e4b7591cf3c14ca936979648559..152dcd9d05b8c5853e9972ef63a5579a90ed38ee 100644 (file)
--- a/gpsbabel/cet/ibm1004.h
+++ b/gpsbabel/cet/ibm1004.h
@@ -28,7 +28,7 @@
 
 const char *cet_cs_alias_ibm1004[] = 
 {
-       "IBM1004/CR-LF", "1004/CR-LF", "CP1004/CR-LF", "os2latin1",
+       "IBM1004", "1004", "CP1004", "os2latin1",
        NULL
 };
 

diff --git a/gpsbabel/cet/ibm1026.h b/gpsbabel/cet/ibm1026.h
index 8b528c365326136ddbab83cc36bb7460d35ec308..18b86c1aa0298d98c8bb0562c9811a3e2b080167 100644 (file)
--- a/gpsbabel/cet/ibm1026.h
+++ b/gpsbabel/cet/ibm1026.h
@@ -28,7 +28,7 @@
 
 const char *cet_cs_alias_ibm1026[] = 
 {
-       "IBM1026/CR-LF", "1026/CR-LF", "CP1026/CR-LF", NULL
+       "IBM1026", "1026", "CP1026", NULL
 };
 
 #define cet_ucs4_ofs_ibm1026 4

diff --git a/gpsbabel/cet/ibm1047.h b/gpsbabel/cet/ibm1047.h
index 21447e1fbbaa0bf3952240cd1e3814ab18f10816..873d11d3c17f2ba1225d33a96784d27aab7766ed 100644 (file)
--- a/gpsbabel/cet/ibm1047.h
+++ b/gpsbabel/cet/ibm1047.h
@@ -28,7 +28,7 @@
 
 const char *cet_cs_alias_ibm1047[] = 
 {
-       "IBM1047/CR-LF", "1047/CR-LF", "CP1047/CR-LF", NULL
+       "IBM1047", "1047", "CP1047", NULL
 };
 
 #define cet_ucs4_ofs_ibm1047 4

diff --git a/gpsbabel/cet/ibm256.h b/gpsbabel/cet/ibm256.h
index dc7a683c2ef52bde04fa80095cec467fc767d0d0..8603ab569313bd2ae8b8b601e9b4ec7a1c15b94c 100644 (file)
--- a/gpsbabel/cet/ibm256.h
+++ b/gpsbabel/cet/ibm256.h
@@ -28,7 +28,7 @@
 
 const char *cet_cs_alias_ibm256[] = 
 {
-       "IBM256/CR-LF", "256/CR-LF", "CP256/CR-LF", "EBCDIC-INT1",
+       "IBM256", "256", "CP256", "EBCDIC-INT1",
        NULL
 };
 

diff --git a/gpsbabel/cet/ibm273.h b/gpsbabel/cet/ibm273.h
index 83794b1e8373bddc65b5752bdf4c98aa60701a54..63fd4ddd89744c6ff2dc200d265362e09deba661 100644 (file)
--- a/gpsbabel/cet/ibm273.h
+++ b/gpsbabel/cet/ibm273.h
@@ -28,7 +28,7 @@
 
 const char *cet_cs_alias_ibm273[] = 
 {
-       "IBM273/CR-LF", "273/CR-LF", "CP273/CR-LF", NULL
+       "IBM273", "273", "CP273", NULL
 };
 
 #define cet_ucs4_ofs_ibm273 4

diff --git a/gpsbabel/cet/ibm277.h b/gpsbabel/cet/ibm277.h
index cd6f21d1aa7ee2087de666b411955a06ed55bc27..c1356e86f90c0a9396980bbd1c21eadeda0f5ab9 100644 (file)
--- a/gpsbabel/cet/ibm277.h
+++ b/gpsbabel/cet/ibm277.h
@@ -28,7 +28,7 @@
 
 const char *cet_cs_alias_ibm277[] = 
 {
-       "IBM277/CR-LF", "EBCDIC-CP-DK", "EBCDIC-CP-NO", NULL
+       "IBM277", "EBCDIC-CP-DK", "EBCDIC-CP-NO", NULL
 };
 
 #define cet_ucs4_ofs_ibm277 4

diff --git a/gpsbabel/cet/ibm278.h b/gpsbabel/cet/ibm278.h
index c42b9086f24a0c2fa8edc1053400b479e6b99c26..c89719db6ec760d7320087c608409d8cc8baf2a5 100644 (file)
--- a/gpsbabel/cet/ibm278.h
+++ b/gpsbabel/cet/ibm278.h
@@ -28,7 +28,7 @@
 
 const char *cet_cs_alias_ibm278[] = 
 {
-       "IBM278/CR-LF", "278/CR-LF", "CP278/CR-LF", "ebcdic-cp-fi", 
+       "IBM278", "278", "CP278", "ebcdic-cp-fi", 
        "ebcdic-cp-se", NULL
 };
 

diff --git a/gpsbabel/cet/ibm280.h b/gpsbabel/cet/ibm280.h
index d996ae18203759ed27feb5a011fe59cb163e14a9..da3e7e30db04b735eb8f8480b730533fe5137c2a 100644 (file)
--- a/gpsbabel/cet/ibm280.h
+++ b/gpsbabel/cet/ibm280.h
@@ -28,7 +28,7 @@
 
 const char *cet_cs_alias_ibm280[] = 
 {
-       "IBM280/CR-LF", "280/CR-LF", "CP280/CR-LF", "ebcdic-cp-it",
+       "IBM280", "280", "CP280", "ebcdic-cp-it",
        NULL
 };
 

diff --git a/gpsbabel/cet/ibm284.h b/gpsbabel/cet/ibm284.h
index e3ba3f51982c6b978bdc4cfb0aee58d9a9aa9689..84e61712f659c8725b177195a5feb45a7badbc82 100644 (file)
--- a/gpsbabel/cet/ibm284.h
+++ b/gpsbabel/cet/ibm284.h
@@ -28,7 +28,7 @@
 
 const char *cet_cs_alias_ibm284[] = 
 {
-       "IBM284/CR-LF", "284/CR-LF", "CP284/CR-LF", "ebcdic-cp-es",
+       "IBM284", "284", "CP284", "ebcdic-cp-es",
        NULL
 };
 

diff --git a/gpsbabel/cet/ibm285.h b/gpsbabel/cet/ibm285.h
index 3c63f684a56307adf0e2eb8dd34270168c74daa9..9fbdd32bb1df64c8549a832a9a4912a51767c14c 100644 (file)
--- a/gpsbabel/cet/ibm285.h
+++ b/gpsbabel/cet/ibm285.h
@@ -28,7 +28,7 @@
 
 const char *cet_cs_alias_ibm285[] = 
 {
-       "IBM285/CR-LF", "285/CR-LF", "CP285/CR-LF", "ebcdic-cp-gb",
+       "IBM285", "285", "CP285", "ebcdic-cp-gb",
        NULL
 };
 

diff --git a/gpsbabel/cet/ibm297.h b/gpsbabel/cet/ibm297.h
index db48e9a5c7556e905d6045677f21476fcb40665f..9b327eee5fcadbf854bcdfd8b9b90c6f52aa6322 100644 (file)
--- a/gpsbabel/cet/ibm297.h
+++ b/gpsbabel/cet/ibm297.h
@@ -28,7 +28,7 @@
 
 const char *cet_cs_alias_ibm297[] = 
 {
-       "IBM297/CR-LF", "297/CR-LF", "CP297/CR-LF", "ebcdic-cp-fr",
+       "IBM297", "297", "CP297", "ebcdic-cp-fr",
        NULL
 };
 

diff --git a/gpsbabel/cet/ibm437.h b/gpsbabel/cet/ibm437.h
index 173828cca9bbc0a285272a1edc863a62771082e6..7c0520ea8a0ad61262702a2af89bf4e136713a00 100644 (file)
--- a/gpsbabel/cet/ibm437.h
+++ b/gpsbabel/cet/ibm437.h
@@ -28,7 +28,7 @@
 
 const char *cet_cs_alias_ibm437[] = 
 {
-       "IBM437/CR-LF", "437/CR-LF", "CP437/CR-LF", NULL
+       "IBM437", "437", "CP437", NULL
 };
 
 #define cet_ucs4_ofs_ibm437 128

diff --git a/gpsbabel/cet/ibm500.h b/gpsbabel/cet/ibm500.h
index d023dd89f16a13c4ad10527604fb49e88c23983a..8d64499a09e042ca01973b068de3549586352cbb 100644 (file)
--- a/gpsbabel/cet/ibm500.h
+++ b/gpsbabel/cet/ibm500.h
@@ -28,7 +28,7 @@
 
 const char *cet_cs_alias_ibm500[] = 
 {
-       "IBM500/CR-LF", "500/CR-LF", "500V1", "CP500/CR-LF", 
+       "IBM500", "500", "500V1", "CP500", 
        "ebcdic-cp-be", "ebcdic-cp-ch", NULL
 };
 

diff --git a/gpsbabel/cet/ibm850.h b/gpsbabel/cet/ibm850.h
index 30a039be9c31f6239321c7a51bcec47b92ecc5b0..cb4e04ad52ce1f47c17c4f74528efee97eaa2b11 100644 (file)
--- a/gpsbabel/cet/ibm850.h
+++ b/gpsbabel/cet/ibm850.h
@@ -28,7 +28,7 @@
 
 const char *cet_cs_alias_ibm850[] = 
 {
-       "IBM850/CR-LF", "850/CR-LF", "CP850/CR-LF", "csPC850Multilingual",
+       "IBM850", "850", "CP850", "csPC850Multilingual",
        NULL
 };
 

diff --git a/gpsbabel/cet/ibm851.h b/gpsbabel/cet/ibm851.h
index ad35b9f731404d23058f6c1b23c2b06c0029aa01..95bab532c1fba46ef4ba390d15e8922237146dce 100644 (file)
--- a/gpsbabel/cet/ibm851.h
+++ b/gpsbabel/cet/ibm851.h
@@ -28,7 +28,7 @@
 
 const char *cet_cs_alias_ibm851[] = 
 {
-       "IBM851/CR-LF", "851/CR-LF", "CP851/CR-LF", NULL
+       "IBM851", "851", "CP851", NULL
 };
 
 #define cet_ucs4_ofs_ibm851 128

diff --git a/gpsbabel/cet/ibm852.h b/gpsbabel/cet/ibm852.h
index 019994dad8872392f47dc5cf86ce05d45fc54321..8332c19c32ebf91bac19b2e2f548b6f05cfec13c 100644 (file)
--- a/gpsbabel/cet/ibm852.h
+++ b/gpsbabel/cet/ibm852.h
@@ -28,7 +28,7 @@
 
 const char *cet_cs_alias_ibm852[] = 
 {
-       "IBM852/CR-LF", "852/CR-LF", "CP852/CR-LF", "pcl2", 
+       "IBM852", "852", "CP852", "pcl2", 
        "pclatin2", NULL
 };
 

diff --git a/gpsbabel/cet/ibm855.h b/gpsbabel/cet/ibm855.h
index ad38eeda46b2ade9ac3f0fa5eedbcfe06e47f1ca..4ed6603e8477cbcd01eefeb9b45a74a42818bd8c 100644 (file)
--- a/gpsbabel/cet/ibm855.h
+++ b/gpsbabel/cet/ibm855.h
@@ -28,7 +28,7 @@
 
 const char *cet_cs_alias_ibm855[] = 
 {
-       "IBM855/CR-LF", "855/CR-LF", "CP855/CR-LF", NULL
+       "IBM855", "855", "CP855", NULL
 };
 
 #define cet_ucs4_ofs_ibm855 128

diff --git a/gpsbabel/cet/ibm857.h b/gpsbabel/cet/ibm857.h
index 8f61a888cd43551b65f207e343ef5a03365d0e48..4b26cdb28d5d3126db86ba361d6397b34575972e 100644 (file)
--- a/gpsbabel/cet/ibm857.h
+++ b/gpsbabel/cet/ibm857.h
@@ -28,7 +28,7 @@
 
 const char *cet_cs_alias_ibm857[] = 
 {
-       "IBM857/CR-LF", "857/CR-LF", "CP857/CR-LF", NULL
+       "IBM857", "857", "CP857", NULL
 };
 
 #define cet_ucs4_ofs_ibm857 128

diff --git a/gpsbabel/cet/ibm860.h b/gpsbabel/cet/ibm860.h
index 12df8608bf626498219451c6541a1f10daf8e406..c2d2ced626c6ff586d818e4c9b0233ffe264049c 100644 (file)
--- a/gpsbabel/cet/ibm860.h
+++ b/gpsbabel/cet/ibm860.h
@@ -28,7 +28,7 @@
 
 const char *cet_cs_alias_ibm860[] = 
 {
-       "IBM860/CR-LF", "860/CR-LF", "CP860/CR-LF", NULL
+       "IBM860", "860", "CP860", NULL
 };
 
 #define cet_ucs4_ofs_ibm860 128

diff --git a/gpsbabel/cet/ibm861.h b/gpsbabel/cet/ibm861.h
index edd8e250f475f9eca2d62a2a2e3d7fa5fd5b5de7..cd8520f4e531f31826f0c6a963c76e07c8257680 100644 (file)
--- a/gpsbabel/cet/ibm861.h
+++ b/gpsbabel/cet/ibm861.h
@@ -28,7 +28,7 @@
 
 const char *cet_cs_alias_ibm861[] = 
 {
-       "IBM861/CR-LF", "861/CR-LF", "CP861/CR-LF", "cp-is",
+       "IBM861", "861", "CP861", "cp-is",
        NULL
 };
 

diff --git a/gpsbabel/cet/ibm862.h b/gpsbabel/cet/ibm862.h
index 611fbbf7edb64bfe6439ac3a44f7fe078e0facab..f7a559f6528598bf5db12f7dda3b690eed756357 100644 (file)
--- a/gpsbabel/cet/ibm862.h
+++ b/gpsbabel/cet/ibm862.h
@@ -28,7 +28,7 @@
 
 const char *cet_cs_alias_ibm862[] = 
 {
-       "IBM862/CR-LF", "862/CR-LF", "CP862/CR-LF", NULL
+       "IBM862", "862", "CP862", NULL
 };
 
 #define cet_ucs4_ofs_ibm862 128

diff --git a/gpsbabel/cet/ibm863.h b/gpsbabel/cet/ibm863.h
index 682f01d8552b268617ae1bfc196847a197615ca5..97909f6dbc243ad1f93f50d15a9bfb1cbcbcb0a6 100644 (file)
--- a/gpsbabel/cet/ibm863.h
+++ b/gpsbabel/cet/ibm863.h
@@ -28,7 +28,7 @@
 
 const char *cet_cs_alias_ibm863[] = 
 {
-       "IBM863/CR-LF", "863/CR-LF", "CP863/CR-LF", NULL
+       "IBM863", "863", "CP863", NULL
 };
 
 #define cet_ucs4_ofs_ibm863 128

diff --git a/gpsbabel/cet/ibm864.h b/gpsbabel/cet/ibm864.h
index 4ec9234da322700293daf8504fdaa67319aae919..5dfac836f1caf00dec65b0737cdd73f568326806 100644 (file)
--- a/gpsbabel/cet/ibm864.h
+++ b/gpsbabel/cet/ibm864.h
@@ -28,7 +28,7 @@
 
 const char *cet_cs_alias_ibm864[] = 
 {
-       "IBM864/CR-LF", "864/CR-LF", "CP864/CR-LF", NULL
+       "IBM864", "864", "CP864", NULL
 };
 
 #define cet_ucs4_ofs_ibm864 128

diff --git a/gpsbabel/cet/ibm865.h b/gpsbabel/cet/ibm865.h
index c78f8a12b9580f66bc6c4ebc3406fa9dbcc36247..2cde68dd86f2f13224e051f0ee579be92699b313 100644 (file)
--- a/gpsbabel/cet/ibm865.h
+++ b/gpsbabel/cet/ibm865.h
@@ -28,7 +28,7 @@
 
 const char *cet_cs_alias_ibm865[] = 
 {
-       "IBM865/CR-LF", "865/CR-LF", "CP865/CR-LF", NULL
+       "IBM865", "865", "CP865", NULL
 };
 
 #define cet_ucs4_ofs_ibm865 128

diff --git a/gpsbabel/cet/ibm868.h b/gpsbabel/cet/ibm868.h
index 5d9ac2728555a37b444eca37e224de463b398cca..1c278ef62236073feddc3938c2ca997634fe5e2f 100644 (file)
--- a/gpsbabel/cet/ibm868.h
+++ b/gpsbabel/cet/ibm868.h
@@ -28,7 +28,7 @@
 
 const char *cet_cs_alias_ibm868[] = 
 {
-       "IBM868/CR-LF", "868/CR-LF", "CP868/CR-LF", "cp-ar",
+       "IBM868", "868", "CP868", "cp-ar",
        NULL
 };
 

diff --git a/gpsbabel/cet/ibm869.h b/gpsbabel/cet/ibm869.h
index fe2316021cf44d13013f168eec193a833416d06b..57f2d9e0f3f5c7f84e101c677f192e5914b299b6 100644 (file)
--- a/gpsbabel/cet/ibm869.h
+++ b/gpsbabel/cet/ibm869.h
@@ -28,7 +28,7 @@
 
 const char *cet_cs_alias_ibm869[] = 
 {
-       "IBM869/CR-LF", "869/CR-LF", "CP869/CR-LF", "cp-gr",
+       "IBM869", "869", "CP869", "cp-gr",
        NULL
 };
 

diff --git a/gpsbabel/cet/ibm871.h b/gpsbabel/cet/ibm871.h
index 5edc574acac129be59b3be8fb7f83fcd657d204a..1fddaca3b20f44389a5013b6b54f3e02b647775a 100644 (file)
--- a/gpsbabel/cet/ibm871.h
+++ b/gpsbabel/cet/ibm871.h
@@ -28,7 +28,7 @@
 
 const char *cet_cs_alias_ibm871[] = 
 {
-       "IBM871/CR-LF", "871/CR-LF", "CP871/CR-LF", "ebcdic-cp-is",
+       "IBM871", "871", "CP871", "ebcdic-cp-is",
        NULL
 };
 

diff --git a/gpsbabel/cet/ibm891.h b/gpsbabel/cet/ibm891.h
index 863eb4ee51cbf367bc49a0090c4217c076620bad..2d0f3a6ab15a6d56a919db9daec4bf143d43d786 100644 (file)
--- a/gpsbabel/cet/ibm891.h
+++ b/gpsbabel/cet/ibm891.h
@@ -28,7 +28,7 @@
 
 const char *cet_cs_alias_ibm891[] = 
 {
-       "IBM891/CR-LF", "891/CR-LF", "CP891/CR-LF", NULL
+       "IBM891", "891", "CP891", NULL
 };
 
 #define cet_ucs4_ofs_ibm891 128

diff --git a/gpsbabel/cet/ibm903.h b/gpsbabel/cet/ibm903.h
index 9faf793419288a44784823da94b4d23d0947b553..b9a4d6c19a79ffaea74a321952ee42f62dbf79b6 100644 (file)
--- a/gpsbabel/cet/ibm903.h
+++ b/gpsbabel/cet/ibm903.h
@@ -28,7 +28,7 @@
 
 const char *cet_cs_alias_ibm903[] = 
 {
-       "IBM903/CR-LF", "903/CR-LF", "CP903/CR-LF", NULL
+       "IBM903", "903", "CP903", NULL
 };
 
 #define cet_ucs4_ofs_ibm903 128

diff --git a/gpsbabel/cet/ibm904.h b/gpsbabel/cet/ibm904.h
index fdd5207bf95d9b63eae1a240d5b4a94684fc09df..78f489c8b45b20299c6a1266e36bff79d9063033 100644 (file)
--- a/gpsbabel/cet/ibm904.h
+++ b/gpsbabel/cet/ibm904.h
@@ -28,7 +28,7 @@
 
 const char *cet_cs_alias_ibm904[] = 
 {
-       "IBM904/CR-LF", "904/CR-LF", "CP904/CR-LF", NULL
+       "IBM904", "904", "CP904", NULL
 };
 
 #define cet_ucs4_ofs_ibm904 128

diff --git a/gpsbabel/cet/iso_8859_1.h b/gpsbabel/cet/iso_8859_1.h
index 0e606255750efcc6bf1233ebd37109c8e7afe003..8dab41ff09daab1639e56d3d02d318ad15d8afc7 100644 (file)
--- a/gpsbabel/cet/iso_8859_1.h
+++ b/gpsbabel/cet/iso_8859_1.h
@@ -28,8 +28,8 @@
 
 const char *cet_cs_alias_iso_8859_1[] = 
 {
-       "ISO-8859-1", "819/CR-LF", "CP819/CR-LF", "csISOLatin1", 
-       "IBM819/CR-LF", "ISO8859-1", "iso-ir-100", "ISO_8859-1", 
+       "ISO-8859-1", "819", "CP819", "csISOLatin1", 
+       "IBM819", "ISO8859-1", "iso-ir-100", "ISO_8859-1", 
        "ISO_8859-1:1987", "l1", "lat1", "latin1", 
        "Latin-1", NULL
 };

diff --git a/gpsbabel/cet/iso_8859_10.h b/gpsbabel/cet/iso_8859_10.h
index cd4ac507bbaf4c09756c3a960fee8c6689e5f415..8adfc713284b105af953180b49a6aef39794a611 100644 (file)
--- a/gpsbabel/cet/iso_8859_10.h
+++ b/gpsbabel/cet/iso_8859_10.h
@@ -29,8 +29,8 @@
 const char *cet_cs_alias_iso_8859_10[] = 
 {
        "ISO-8859-10", "csISOLatin6", "ISO8859-10", "iso-ir-157", 
-       "ISO_8859-10", "ISO_8859-10:1992", "ISO_8859-10:1993", "L6", 
-       "latin6", NULL
+       "ISO_8859-10", "ISO_8859-10:1992", "ISO_8859-10:1993", 
+       "l6", "lat6", "latin6", NULL
 };
 
 #define cet_ucs4_ofs_iso_8859_10 161

diff --git a/gpsbabel/cet/iso_8859_13.h b/gpsbabel/cet/iso_8859_13.h
index f4997967d8f97c85aa2fe87e537e43048a42c144..e67175e0947c970ca2a9794daaa3a1b5762f58e2 100644 (file)
--- a/gpsbabel/cet/iso_8859_13.h
+++ b/gpsbabel/cet/iso_8859_13.h
@@ -29,8 +29,8 @@
 const char *cet_cs_alias_iso_8859_13[] = 
 {
        "ISO-8859-13", "ISO8859-13", "iso-baltic", "ISO-IR-179", 
-       "iso-ir-179a", "ISO_8859-13", "ISO_8859-13:1998", "l7", 
-       "latin7", NULL
+       "iso-ir-179a", "ISO_8859-13", "ISO_8859-13:1998", 
+       "l7", "lat7", "latin7", NULL
 };
 
 #define cet_ucs4_ofs_iso_8859_13 165

diff --git a/gpsbabel/cet/iso_8859_14.h b/gpsbabel/cet/iso_8859_14.h
index da7a3a9aadabad0d1ef185ae02d02b200228c7a7..fb47dd817701976841eba7a5b839fa5d481c9f7e 100644 (file)
--- a/gpsbabel/cet/iso_8859_14.h
+++ b/gpsbabel/cet/iso_8859_14.h
@@ -29,7 +29,7 @@
 const char *cet_cs_alias_iso_8859_14[] = 
 {
        "ISO-8859-14", "ISO8859-14", "iso-celtic", "iso-ir-199", 
-       "ISO_8859-14", "ISO_8859-14:1998", "l8", "latin8",
+       "ISO_8859-14", "ISO_8859-14:1998", "l8", "lat8", "latin8",
        NULL
 };
 

diff --git a/gpsbabel/cet/iso_8859_15.h b/gpsbabel/cet/iso_8859_15.h
index 315fb321749f3c5f8e4ec8d8028839472eb6043b..88750962b5e910d8e0b90d67f842fbbd2e927a74 100644 (file)
--- a/gpsbabel/cet/iso_8859_15.h
+++ b/gpsbabel/cet/iso_8859_15.h
@@ -29,7 +29,7 @@
 const char *cet_cs_alias_iso_8859_15[] = 
 {
        "ISO-8859-15", "ISO8859-15", "iso-ir-203", "ISO_8859-15", 
-       "ISO_8859-15:1998", "l9", "latin9", NULL
+       "ISO_8859-15:1998", "l9", "lat9", "latin9", NULL
 };
 
 #define cet_ucs4_ofs_iso_8859_15 164

diff --git a/gpsbabel/cet/iso_8859_2.h b/gpsbabel/cet/iso_8859_2.h
index bf2af29e694c982f3833af32feb78abc5f123777..6e348cc06e96302c903df628ddc12e23198e260c 100644 (file)
--- a/gpsbabel/cet/iso_8859_2.h
+++ b/gpsbabel/cet/iso_8859_2.h
@@ -28,9 +28,9 @@
 
 const char *cet_cs_alias_iso_8859_2[] = 
 {
-       "ISO-8859-2", "912/CR-LF", "CP912/CR-LF", "csISOLatin2", 
-       "IBM912/CR-LF", "ISO8859-2", "iso-ir-101", "ISO_8859-2", 
-       "ISO_8859-2:1987", "l2", "latin2", NULL
+       "ISO-8859-2", "912", "CP912", "csISOLatin2", 
+       "IBM912", "ISO8859-2", "iso-ir-101", "ISO_8859-2", 
+       "ISO_8859-2:1987", "l2", "lat2", "latin2", NULL
 };
 
 #define cet_ucs4_ofs_iso_8859_2 161

diff --git a/gpsbabel/cet/iso_8859_3.h b/gpsbabel/cet/iso_8859_3.h
index 8bc5e944efe23a279cd777083e4ca2acbfe5ff2f..1a264d19686f3829c2860598e60ccb414957f779 100644 (file)
--- a/gpsbabel/cet/iso_8859_3.h
+++ b/gpsbabel/cet/iso_8859_3.h
@@ -29,7 +29,7 @@
 const char *cet_cs_alias_iso_8859_3[] = 
 {
        "ISO-8859-3", "csISOLatin3", "ISO8859-3", "iso-ir-109", 
-       "ISO_8859-3", "ISO_8859-3:1988", "l3", "latin3",
+       "ISO_8859-3", "ISO_8859-3:1988", "l3", "lat3", "latin3",
        NULL
 };
 

diff --git a/gpsbabel/cet/iso_8859_4.h b/gpsbabel/cet/iso_8859_4.h
index 962852968d6ae89efa78687a4e3911d75c1fc68f..e9d8a6e0487c5ecb85fcefebff6dd6dc37a081dc 100644 (file)
--- a/gpsbabel/cet/iso_8859_4.h
+++ b/gpsbabel/cet/iso_8859_4.h
@@ -29,7 +29,7 @@
 const char *cet_cs_alias_iso_8859_4[] = 
 {
        "ISO-8859-4", "csISOLatin4", "ISO8859-4", "iso-ir-110", 
-       "ISO_8859-4", "ISO_8859-4:1988", "l4", "latin4",
+       "ISO_8859-4", "ISO_8859-4:1988", "l4", "lat4", "latin4",
        NULL
 };
 

diff --git a/gpsbabel/cet/iso_8859_9.h b/gpsbabel/cet/iso_8859_9.h
index 0fc4c21b13110bdb1d9db8105f880c1cc620d0c0..4babb270b9f07387028a6ff791ceee5a69644022 100644 (file)
--- a/gpsbabel/cet/iso_8859_9.h
+++ b/gpsbabel/cet/iso_8859_9.h
@@ -29,7 +29,7 @@
 const char *cet_cs_alias_iso_8859_9[] = 
 {
        "ISO-8859-9", "csISOLatin5", "ISO8859-9", "iso-ir-148", 
-       "ISO_8859-9", "ISO_8859-9:1989", "l5", "latin5",
+       "ISO_8859-9", "ISO_8859-9:1989", "l5", "lat5", "latin5",
        NULL
 };
 

diff --git a/gpsbabel/cet/macintosh.h b/gpsbabel/cet/macintosh.h
index f0cafc5a2b5ca8452ac3d11bfec1ec1baf57f0f6..f4f29735f7423e17be371d367259d26e2e1e21e5 100644 (file)
--- a/gpsbabel/cet/macintosh.h
+++ b/gpsbabel/cet/macintosh.h
@@ -28,7 +28,7 @@
 
 const char *cet_cs_alias_macintosh[] = 
 {
-       "macintosh/CR", "csMacintosh", "mac/CR", "MacRoman",
+       "macintosh", "csMacintosh", "mac", "MacRoman",
        NULL
 };
 

diff --git a/gpsbabel/cet/macintosh_ce.h b/gpsbabel/cet/macintosh_ce.h
index 1531f9d53c370c65e58a50bf811332be122d6f39..4507de63723780e02c505233717c92be12194bcf 100644 (file)
--- a/gpsbabel/cet/macintosh_ce.h
+++ b/gpsbabel/cet/macintosh_ce.h
@@ -28,7 +28,7 @@
 
 const char *cet_cs_alias_macintosh_ce[] = 
 {
-       "macintosh_ce/CR", "macce/CR", NULL
+       "macintosh_ce", "macce", NULL
 };
 
 #define cet_ucs4_ofs_macintosh_ce 128